<!DOCTYPE html>
<html lang="en">

<head>
    <meta charset="UTF-8">
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
    <title>Document</title>
</head>

<body>
    <h1>稳定并上线的app1.0版本</h1>
<<<<<<< HEAD
    <button>直播功能，飞机大炮漫天飞</button>
=======
    <h1>购物车功能，支持在线下单及支付</h1>
>>>>>>> xianyu
</body>

</html>